From 11b5399895228062ba596e4361a97759b6865a18 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 28 Jul 2022 21:58:57 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 532960 -> 533679 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 35c0b746c7c..fc8819193fa 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -919,7 +919,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index 490789773d171937b2da514b810dfd22c61d76b6..9185cd4b1b6ab0d21e1a2ccbcbf486357b36e9c2 100644
GIT binary patch
delta 555
zcmaEGSYiE1g@!GRpR)P56o4Q)E3qswB|kZK^1{QS)9;Hh^6->rmSpHcg{OC=GfJ_;
zIO5ri>MUMB4b%Iw86~I3WHWNX<#MwbW#Dp7)0tx#jp1?^vKZCm!Pdp<=s>ImSrQL5
z*S0dXIJW(9HX{%-0WtIT$Js0$27;-1iAg!B@%bs)N(zd$3VHd{6?<8<ruWZb2@>bb
zOj9UHEiO?|Qb9Iq@<KtG=`ZK77*Bt>n3ZpOUK0!7bd$L(64SZ9G4W0hoy(#+y<iFp
z>-6fmEOOI#U1OA)UVn^{Yx?%NEK<|C*Rlvt?l<9_Ua+5$W%`@BEaKA-#IuM^7o5jp
zIDO?h7IB~?$K(lqrqk=@vDi*Ou!4nW`u=$=veS2Uvq(=jn99O3{q;N+-RX&o*d!+3
z6Xuw%F(0UGt}GMB^bPGm$=zJcTmiO9K+h_H!vGZgAdr^H#i@{*Q=H1h$*EA9SDad+
z;N=+R=;H4T6bDK|)qqui*eFV-H_T@dQS=OU_X4Wd<U)iB)Ci~yFkHlWF*J%zH|}H;
anl5*Ug}?p6d=?;P1!A`C7v{4IGywoe>bdy<

delta 229
zcmZ2~QsKd2g@!GRpR(I0=Q08@6A&|RpPb85X)yiY5f+u{1<K4E(;fVnxu(}QvuI9l
zn#UqOxkiR#`k8qw#?x6_SR|%P&j%8AEi6LQJ?FE?OwXLpB0s&ig+*k#!U;yM>FegR
zNKHTO$-*^#!(1l8=`ZH9h)+*&VB(uDx`4%Sy6+qo&*{q-uoz6gzko$?x(pi!_jKun
zK#8(zECSPW7P8n*-?)%Pa=PYjc76pf$1q11e`ifDN9Xw9P^aJ!4XB7`u)7yfV!GjE
WHj(xTi&%h|6^PlkPguk*-vj`8Oi)n(

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 0286cc6cdc6..f833c8b36fc 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 16eba69c3e3..0d5fca58d2c 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,8 +42,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 377c8be0dc5..fc0daf1ed53 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2